From: Fabián Ezequiel Gallina <fgallina@gnu.org>
Date: Wed, 28 Jan 2015 04:03:46 +0000 (-0300)
Subject: Merge from origin/emacs-24
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~23^2~3383^2~41
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=f5ebe84d75bb75156db9e2e0a7ab356941b4ea75;p=emacs.git

Merge from origin/emacs-24

The following commits were skipped:

81fb8ab Backport: Fix package tests when TMPDIR is in HOME
3a345b5 Backport: Handle the `neg' operator in some calc-units functions.
---

f5ebe84d75bb75156db9e2e0a7ab356941b4ea75